From 380276648e8b03a860a7b365d9d48cbfd969b490 Mon Sep 17 00:00:00 2001 From: "dan@guaranine.beaverton.ibm.com" Date: Thu, 10 Nov 2005 11:47:38 +0100 Subject: [PATCH] Tweak the usage of mke2fs to be quiet, so that the XML reports contain less garbage --- .../09_block_attach_and_dettach_device_check_data_pos.py | 4 +++- tools/xm-test/tests/restore/04_restore_withdevices_pos.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py b/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py index c379fef4e5..0d782dd4c2 100644 --- a/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py +++ b/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py @@ -36,7 +36,9 @@ except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e)) -os.system("mkfs.ext2 -F /dev/ram1") +s, o = traceCommand("mke2fs -q -F /dev/ram1") +if s != 0: + FAIL("mke2fs returned %i != 0" % s) for i in range(10): status, output = traceCommand("xm block-attach %s phy:ram1 hda1 w" % domain.getName()) diff --git a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py index 4bbecaf1ad..e287fa8a1c 100644 --- a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py +++ b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py @@ -9,9 +9,9 @@ domain = XmTestDomain() domain.configAddDisk("phy:/dev/ram0", "hda1", "w") -s, o = traceCommand("mkfs /dev/ram0") +s, o = traceCommand("mke2fs -q /dev/ram0") if s != 0: - FAIL("Unable to mkfs /dev/ram0 in dom0") + FAIL("Unable to mke2fs /dev/ram0 in dom0") try: domain.start() -- 2.30.2